seem this is still a bug ... run into the same problem (using @BabyJ solution) but still not working proper