Two fixes: #5 #6