Fixed a bug I caused last commit with runtime errors