issue 10 finally fixed OMG this took forever