Fixed issue #1213 and others...