Hopefully completly fixed decay this time