Bugfix  #4