Fixes #182
Fixes #179

Probably fixes this bug
Version 2.6.3