Fixed just, added test