Changed stuff according to comments on ae4edded89786ab55222ae547857d58459cd5434