Fixes getById() issue && FIxes #3