#251: Menu fixed