Dev bugfix

(6) added changes