Bug fix commit