fix #14

Quick patch #1 just to get app working for now.