urgent and major bugfix