a bit more HIG compatible