added fix for issue#6