tagging this version as 2.1.2 -> it seems to work in most cases... -> It also includes some bug correction found by Piotr
