CODE: Better version of previous fix