Quick work-around to do more testing