making Flaw Clastic 0.4 ready