Crash during load fixes #318
Incorrect clipping fixes #319