Fix for issue #11 - adding empty prefix