Fumble around to make it work (it doesn't atm)

Signed-off-by: Igor Popov <igor.popov89@gmail.com>