Fixed changes so that I can import without issues again ... hopefully