Added work-around for Python