Fix from Jake Petroules