cc: @sk22 Btw check the commit before this one, because there is a fix that applies for Megalodon there as well