[TESTING] Should fix #2 for now, there is probably more to it than this though.