final bugfix for 0.0.5 alpha