fix decomposition issues, closes #4