BUG FIX: squashed bugs