ADDED bug