Some bug fixes
Version 2.1.2