probably fixed #137, still needs testing