Fixes Issue 320