Another variant to fix problem