bug FIXED in master