FIXED: Weird issue with pegasus