Found better solution ...