bug fix: for marie m. 2