Fix #35 by changing instance declarations.