merged switching-behaviour with issue14