Fixed strange problems