Small Bugfix
Fix for issue #14