Fixes Issues/22