#49 Fixed