Fixes #386