Fixed bug in a69d2a47efdfea0e32b99444fb90818673c2b587