Fix for issue#12