Version 0.5: fixes again