Fixed the idea of #49