Critical bugfix. Version 0.6.4