strange fix for #553, also #539 take note