Fixes Issue 523