Fixed in cleanup branch