Fix Bug: #196 #240 #268