Reverted to dc42's v0.76