Added fix and removed comments. Still inaccurate