fixed bug
fixed a bug. Merge branch 'develop' into staging