bugfix
Merge branch '361' into 361-151-362