ported to SDK 0.4.4