fixed bug introduced last time