Fix #1185 (RTS part, also needs corresponding change to libraries/base)