Eluna fixes #14