Some stuff for 0.159+