0.7.3 is starting to be seriously broken