Fixes #356 in Development