Cleaned up assertion