Fixes: #86 #428