Hack and new issue. Discuss and agree on proper solution before release