bug fixed for version 1.1 production