[BUGFIX] Fixes #818