[FIX] Fixes #945