Cause issue #557, @ideasasylum could you have a look at it please?