Finnally! THIS FIXES #73