moya fixed somehow