Used decorator to fix #36.