Fixed issue #123 @MrBrixican