LUN-1260: Small bugfix