Adding a fix for small grabs