Fixed bugs only for GPDB41