Fixed crash with Sherlock
Minfixes