Bug Fix version 1.1

Bug fix for production