fixes from 20-01-2013