Updated version after Stephen fix.