Bugfix: two unitialised variables