mega fix for the 0.9 of the love