Revert "Fixed 530"

This reverts commit c3f9556e615daf6f766062431a6846cc7b6ce74c.