more bugfix for v0.0.4 alpha