Partially fixed tonibm19's mess.