[FIX] Fixes #1110