fix for MIFOSX-1164