Fixes: #2 #3