Fixes #316 manually (unable to merge)