Fixes Issue 155