Fixed Issues #242 / #213 / #210