Fixes RM#3281