Fixing shelbys bug