slightly updated version, still no fix for the bug as of yet