quick and dirty solution refs #14