Removed crash inducing bug