fix from JNK THX