Doing a quick fix to see if we can get things working on build