Fixed issue with missing shells