Fixed Issue #243 and more