singmann Should fix #26