Fix from 07.01.13