added fix for a new problem concerning the previous bug