Last minute bugfix for 0.7.3