big fix: runtime errors