Fixes: Issues 1