I could not agree more on this, I need to fix #306 to do the same!