Bug re-fixed