code fixed #155 #156 #159 #195