small changes that may or may not solve troubles encountered by saroele