Fix for the bug caused by previous commit