This is a properly fix #14 i believe