Fix for prev commit (275f9c2858163d372b178073168f0bc53a0ba601)