Fixing some broken code I commited previously.