this looks like temporarty hack, please add TODO with note, that it should not go to final release, so we know it