Fixes Issue 412