#25 resolved issues after testing