Prepare for switching pins issue#41