partial FIX for #1184