Fixed problems with new include() logic. For #37