Should fix CoFH issues. Close #4