Moved hack into if statement, so that it will only chrash when calculating that
feature.