Hack before serious merge