Fixed 2273, 2274 and 2275