Fixes show-stopping exception