Bug fix for resolving maybes