AE: even more debugging for Martijn

AE: squash