Fixing PLUS-1258