Fix some Bugs, V1.4