Runtime fix