issue #536 - removed "Carolina's hack"