Seams to be working now FINALLY fix #24