Fixed Olaf and GP