Fix for shelli