Added workaround for FOSUB issue