FIX for #1080