Fix for prev commit